bitkeeper revision 1.1236.1.178 (424c71ffL0fO0Lled7Iksns4CZgUlw)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 31 Mar 2005 21:56:15 +0000 (21:56 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 31 Mar 2005 21:56:15 +0000 (21:56 +0000)
commite709e8d4080fcf820c5231869dad8b9de3ad090a
treee297a6f43801cd002e1f6034e5e75d5b351a85a5
parent83e85c921351ca58d007193c7e1b00bd37250146
parentf3328006172156e57754b4c294b5ba392a21d3c4
bitkeeper revision 1.1236.1.178 (424c71ffL0fO0Lled7Iksns4CZgUlw)

manual merge.
linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c
linux-2.6.11-xen-sparse/drivers/xen/blkback/common.h
linux-2.6.11-xen-sparse/drivers/xen/blkback/vbd.c